git-annex.git
14 months agomore OsPath conversion (572/749)
Joey Hess [Thu, 6 Feb 2025 20:18:52 +0000 (16:18 -0400)]
more OsPath conversion (572/749)

Sponsored-by: Jack Hill
14 months agoRevert "update"
Joey Hess [Thu, 6 Feb 2025 15:42:49 +0000 (11:42 -0400)]
Revert "update"

This reverts commit f5c6dc7cfb4ff9d455fe67081f346b65a8803e68.

14 months agoupdate
Joey Hess [Thu, 6 Feb 2025 15:40:03 +0000 (11:40 -0400)]
update

14 months agomore OsPath conversion (542/749)
Joey Hess [Thu, 6 Feb 2025 15:38:14 +0000 (11:38 -0400)]
more OsPath conversion (542/749)

Sponsored-by: Luke T. Shumaker
14 months agomore OsPath conversion (520/749)
Joey Hess [Wed, 5 Feb 2025 19:07:59 +0000 (15:07 -0400)]
more OsPath conversion (520/749)

Sponsored-by: mycroft
14 months agoMerge branch 'master' into ospath
Joey Hess [Wed, 5 Feb 2025 17:31:07 +0000 (13:31 -0400)]
Merge branch 'master' into ospath

14 months agomore OsPath conversion (502/749)
Joey Hess [Wed, 5 Feb 2025 17:29:58 +0000 (13:29 -0400)]
more OsPath conversion (502/749)

Sponsored-by: Kevin Mueller on Patreon
14 months agomore OsPath conversion (475/749)
Joey Hess [Wed, 5 Feb 2025 16:14:56 +0000 (12:14 -0400)]
more OsPath conversion (475/749)

Sponsored-by: Nicholas Golder-Manning
14 months agoOsPath conversion of Annex.YouTubeDl
Joey Hess [Wed, 5 Feb 2025 15:56:26 +0000 (11:56 -0400)]
OsPath conversion of Annex.YouTubeDl

The change of R.doesPathExist to doesFileExist I think fixes a reversion
introduced in commit 1ceece3108f03badcca0d9c64cd287f9352656b3. Before
that commit, it was doesFileExist, and I assume to point is that this is
only supposed to return files, not any subdirectories that yt-dlp might
create while running.

14 months agoOsPath conversion of Remote.Adb
Joey Hess [Wed, 5 Feb 2025 15:14:45 +0000 (11:14 -0400)]
OsPath conversion of Remote.Adb

Note that the additional use of System.FilePath.Posix likely fixes a
problem if this were used on windows. The AndroidPath uses / directory
separators. Before this, on windows, \ would have been used.

The change to newtype AndroidPath is only documentation.

14 months agomore OsPath conversion
Joey Hess [Tue, 4 Feb 2025 20:09:47 +0000 (16:09 -0400)]
more OsPath conversion

Sponsored-by: Leon Schuermann
14 months agomore OsPath conversion (464/749)
Joey Hess [Tue, 4 Feb 2025 17:35:17 +0000 (13:35 -0400)]
more OsPath conversion (464/749)

Sponsored-by: unqueued
14 months agomore OsPath conversion
Joey Hess [Mon, 3 Feb 2025 19:16:42 +0000 (15:16 -0400)]
more OsPath conversion

Sponsored-by: Graham Spencer
14 months agoreplace removeLink with removeFile
Joey Hess [Sun, 2 Feb 2025 18:16:58 +0000 (14:16 -0400)]
replace removeLink with removeFile

removeFile calls unlink so removes anything not a directory. So these
are replaceable in order to convert to OsPath.

14 months agomore OsPath conversion
Joey Hess [Sun, 2 Feb 2025 18:03:43 +0000 (14:03 -0400)]
more OsPath conversion

Sponsored-by: Joshua Antonishen
14 months agomore OsPath conversion
Joey Hess [Sat, 1 Feb 2025 18:06:38 +0000 (14:06 -0400)]
more OsPath conversion

Sponsored-by: k0ld
14 months agomore OsPath conversion
Joey Hess [Sat, 1 Feb 2025 15:54:19 +0000 (11:54 -0400)]
more OsPath conversion

Sponsored-by: Brock Spratlen
14 months agomove windows test suite workaround to relatedTemplate
Joey Hess [Thu, 30 Jan 2025 23:06:06 +0000 (19:06 -0400)]
move windows test suite workaround to relatedTemplate

14 months agoRevert "add windows debug"
Joey Hess [Thu, 30 Jan 2025 23:03:36 +0000 (19:03 -0400)]
Revert "add windows debug"

This reverts commit 76bfdf6a0348211ecfe934c93f6a1f08bd537660.

14 months agoadd windows debug
Joey Hess [Thu, 30 Jan 2025 21:45:34 +0000 (17:45 -0400)]
add windows debug

14 months agoRevert "try truncateFilePath on windows again"
Joey Hess [Thu, 30 Jan 2025 21:43:38 +0000 (17:43 -0400)]
Revert "try truncateFilePath on windows again"

This reverts commit 0d4abbcb92ff40e90cbc44f3d1a42243bdbae2ba.

Test suite was failing again with that.

14 months agotry truncateFilePath on windows again
Joey Hess [Thu, 30 Jan 2025 21:06:22 +0000 (17:06 -0400)]
try truncateFilePath on windows again

after fix in commit 773115fd5f9334855b138323b74ca572695208a0
maybe it will work now and not break test suite?

14 months agofix truncateFilePath edge case on windows
Joey Hess [Thu, 30 Jan 2025 20:51:42 +0000 (16:51 -0400)]
fix truncateFilePath edge case on windows

If the filepath starts with something that is not valid utf-8, it would
have returned "". And if the filepath was all non-valid utf-8, it would
also return "".

14 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 30 Jan 2025 20:33:36 +0000 (16:33 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

14 months agotry fixing windows test suite
Joey Hess [Thu, 30 Jan 2025 20:31:49 +0000 (16:31 -0400)]
try fixing windows test suite

Test suite is failing in windows in conflict resolution tests, where the
automatic conflict resolution adds in a .variant file. On windows, those
files are somehow missing. I don't understand why, and the test failures
only happen on appveyor and not in a local windows VM.

So, since replaceFile was recently changed to remove a windows specific
ifdef, put it back, to see if that is somehow causing these failures.

14 months agoAdded a comment
jnkl [Thu, 30 Jan 2025 19:59:09 +0000 (19:59 +0000)]
Added a comment

14 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 30 Jan 2025 19:52:31 +0000 (15:52 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

14 months agomore OsPath conversion
Joey Hess [Thu, 30 Jan 2025 19:46:32 +0000 (15:46 -0400)]
more OsPath conversion

Sponsored-by: Jack Hill
14 months agoAdded a comment
luciusf [Thu, 30 Jan 2025 19:17:58 +0000 (19:17 +0000)]
Added a comment

14 months agoMerge branch 'master' into ospath
Joey Hess [Thu, 30 Jan 2025 19:07:17 +0000 (15:07 -0400)]
Merge branch 'master' into ospath

14 months agoupdate
Joey Hess [Thu, 30 Jan 2025 19:06:37 +0000 (15:06 -0400)]
update

14 months agoMerge branch 'master' into ospath
Joey Hess [Thu, 30 Jan 2025 19:06:05 +0000 (15:06 -0400)]
Merge branch 'master' into ospath

14 months agoMerge branch 'ospath-mk1'
Joey Hess [Thu, 30 Jan 2025 19:05:18 +0000 (15:05 -0400)]
Merge branch 'ospath-mk1'

14 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 30 Jan 2025 19:03:47 +0000 (15:03 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

14 months agoupdate appveyor cache directory
Joey Hess [Thu, 30 Jan 2025 19:02:59 +0000 (15:02 -0400)]
update appveyor cache directory

With old:

Cache entry not found: C:\projects\git-annex\Users\appveyor\.stack

I think fixing this will result in caching preventing a full rebuild of
git-annex each time.

14 months agoresponse
Joey Hess [Thu, 30 Jan 2025 18:57:51 +0000 (14:57 -0400)]
response

14 months agoavoid build warning
Joey Hess [Thu, 30 Jan 2025 18:52:41 +0000 (14:52 -0400)]
avoid build warning

An odd one, it complained about security_attributes being defined but
not used, but it was used..

14 months agoAdded a comment
jnkl [Thu, 30 Jan 2025 18:52:14 +0000 (18:52 +0000)]
Added a comment

14 months agoavoid build warnings on windows
Joey Hess [Thu, 30 Jan 2025 18:49:38 +0000 (14:49 -0400)]
avoid build warnings on windows

14 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 30 Jan 2025 18:39:05 +0000 (14:39 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

14 months ago(no commit message)
jnkl [Thu, 30 Jan 2025 18:35:55 +0000 (18:35 +0000)]

14 months agobring back OsPath changes
Joey Hess [Thu, 30 Jan 2025 18:34:21 +0000 (14:34 -0400)]
bring back OsPath changes

I hope that the windows test suite failure on appveyor was fixed by
updating to a newer windows there. I have not been able to reproduce
that failure in a windows 11 VM run locally.

14 months agoMerge branch 'ospath-mk1' into ospath
Joey Hess [Thu, 30 Jan 2025 18:33:08 +0000 (14:33 -0400)]
Merge branch 'ospath-mk1' into ospath

14 months agoRevert "disable OsPath build flag on windows for now"
Joey Hess [Thu, 30 Jan 2025 18:32:44 +0000 (14:32 -0400)]
Revert "disable OsPath build flag on windows for now"

This reverts commit 55cf9ce28fe1c8a4ee64f1843cd3a88e85bcbf35.

Problem was fixed by commit c1e90767daeff7557e047ea4229d83c4e78f9f12

14 months agofix FileIO openTempFile on Windows
Joey Hess [Thu, 30 Jan 2025 18:23:00 +0000 (14:23 -0400)]
fix FileIO openTempFile on Windows

When an UNC-style path is passed into openTempFile, the returned file
starts with that same style of path. Which can cause problems, eg piping
that filename to git failed. So, convert the output filename to be
relative to the input temp directory.

14 months agofix FileIO openTempFile on Windows
Joey Hess [Thu, 30 Jan 2025 18:23:00 +0000 (14:23 -0400)]
fix FileIO openTempFile on Windows

When an UNC-style path is passed into openTempFile, the returned file
starts with that same style of path. Which can cause problems, eg piping
that filename to git failed. So, convert the output filename to be
relative to the input temp directory.

14 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 30 Jan 2025 17:25:49 +0000 (13:25 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

14 months agoswitch appveyor windows build to newer version
Joey Hess [Thu, 30 Jan 2025 17:24:51 +0000 (13:24 -0400)]
switch appveyor windows build to newer version

14 months ago(no commit message)
matrss [Thu, 30 Jan 2025 14:50:58 +0000 (14:50 +0000)]

14 months agoAdded a comment
dmcardle [Thu, 30 Jan 2025 13:56:30 +0000 (13:56 +0000)]
Added a comment

14 months ago(no commit message)
nobodyinperson [Thu, 30 Jan 2025 12:59:00 +0000 (12:59 +0000)]

14 months ago(no commit message)
beryllium@5bc3c32eb8156390f96e363e4ba38976567425ec [Thu, 30 Jan 2025 02:35:09 +0000 (02:35 +0000)]

14 months agoclose
Joey Hess [Wed, 29 Jan 2025 23:05:37 +0000 (19:05 -0400)]
close

14 months agodocument a SNAFU
Joey Hess [Wed, 29 Jan 2025 23:04:13 +0000 (19:04 -0400)]
document a SNAFU

14 months agothrowing away a week's work
Joey Hess [Wed, 29 Jan 2025 22:59:09 +0000 (18:59 -0400)]
throwing away a week's work

This was an attempt at continuing the RawFilePath transition into an
OsPath transition. Unforunately, it had multiple test suite failures on
windows. Debugging those seems that it would be more work than the
minor optimisation value of this.

14 months agomerge in doc changes from master
Joey Hess [Wed, 29 Jan 2025 22:57:25 +0000 (18:57 -0400)]
merge in doc changes from master

14 months agoMerge branch 'master' into ospath
Joey Hess [Wed, 29 Jan 2025 22:48:02 +0000 (18:48 -0400)]
Merge branch 'master' into ospath

14 months agofix liuxstandalone build
Joey Hess [Wed, 29 Jan 2025 22:12:00 +0000 (18:12 -0400)]
fix liuxstandalone build

14 months agodisable OsPath build flag on windows for now
Joey Hess [Wed, 29 Jan 2025 21:22:21 +0000 (17:22 -0400)]
disable OsPath build flag on windows for now

Test suite failure looks like this:

        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        fatal: could not open '\\?\C:\Users\appveyor\AppData\Local\Temp\1\hash-cc81b41d-dfda-4ae8-904b-b531742443cc' for reading: No such file or directory
        git-annex: fd:4: Data.ByteString.hGetLine: end of file
        git-annex: user error (git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","hash-object","-w","--no-filters","--stdin-paths"] exited 128)

This is apparently in Git.HashObject, and probably in hashBlob, which uses a
temp file with a name starting with "hash", but I have not been able to tell
what's wrong.

I don't understand where the "\\?" path prefix (windows UNC-style path)
is coming from in the path that gets fed into git hash-file, or why git
hash-file can't open the file.

14 months agoremove temp debugging code
Joey Hess [Wed, 29 Jan 2025 21:19:01 +0000 (17:19 -0400)]
remove temp debugging code

14 months agodebug test suite crash on windows
Joey Hess [Wed, 29 Jan 2025 20:37:54 +0000 (16:37 -0400)]
debug test suite crash on windows

14 months agomore OsPath conversion
Joey Hess [Wed, 29 Jan 2025 20:24:51 +0000 (16:24 -0400)]
more OsPath conversion

Sponsored-by: Kevin Mueller
14 months agoMerge branch 'master' into ospath
Joey Hess [Wed, 29 Jan 2025 19:37:19 +0000 (15:37 -0400)]
Merge branch 'master' into ospath

14 months agofix windows build
Joey Hess [Wed, 29 Jan 2025 19:36:41 +0000 (15:36 -0400)]
fix windows build

14 months agowindows build fix
Joey Hess [Wed, 29 Jan 2025 18:59:00 +0000 (14:59 -0400)]
windows build fix

14 months agofix windows build and clarify comment
Joey Hess [Wed, 29 Jan 2025 18:52:20 +0000 (14:52 -0400)]
fix windows build and clarify comment

14 months agoMerge branch 'master' into ospath
Joey Hess [Wed, 29 Jan 2025 18:24:35 +0000 (14:24 -0400)]
Merge branch 'master' into ospath

14 months agofix fromOsPath on windows
Joey Hess [Wed, 29 Jan 2025 18:19:25 +0000 (14:19 -0400)]
fix fromOsPath on windows

Same reasons as 9c9baf7c6581235643661b94f70f76f8a10ae60e

14 months agofix toOsPath on windows
Joey Hess [Wed, 29 Jan 2025 18:06:54 +0000 (14:06 -0400)]
fix toOsPath on windows

After recent changes to use OsPath, test suite fails on windows with:

Exception: Uneven number of bytes: 5. This is not a Word16 bytestream.

Hopefully this fixes it. The innefficiency of the conversion is
unfortunate.

14 months agoresponse
Joey Hess [Wed, 29 Jan 2025 16:06:22 +0000 (12:06 -0400)]
response

14 months agomore OsPath conversion
Joey Hess [Wed, 29 Jan 2025 15:53:20 +0000 (11:53 -0400)]
more OsPath conversion

Sponsored-by: Nicholas Golder-Manning
14 months agoAdded a comment
dmcardle [Wed, 29 Jan 2025 14:44:38 +0000 (14:44 +0000)]
Added a comment

14 months agoAdded a comment
matrss [Wed, 29 Jan 2025 10:13:59 +0000 (10:13 +0000)]
Added a comment

14 months agoAdded a comment
matrss [Wed, 29 Jan 2025 09:56:13 +0000 (09:56 +0000)]
Added a comment

14 months agoAdded a comment
Atemu [Tue, 28 Jan 2025 21:57:42 +0000 (21:57 +0000)]
Added a comment

14 months ago(no commit message)
jnkl [Tue, 28 Jan 2025 21:32:18 +0000 (21:32 +0000)]

14 months agoAdded a comment
jnkl [Tue, 28 Jan 2025 21:20:17 +0000 (21:20 +0000)]
Added a comment

14 months agomore OsPath conversion
Joey Hess [Tue, 28 Jan 2025 20:31:19 +0000 (16:31 -0400)]
more OsPath conversion

Sponsored-by: Luke T. Shumaker
14 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 28 Jan 2025 20:00:09 +0000 (16:00 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

14 months agoMerge branch 'master' into ospath
Joey Hess [Tue, 28 Jan 2025 20:00:03 +0000 (16:00 -0400)]
Merge branch 'master' into ospath

14 months agowindows build fix
Joey Hess [Tue, 28 Jan 2025 19:59:45 +0000 (15:59 -0400)]
windows build fix

and a little more bonus RawFilePath conversion

14 months agomore OsPath conversion
Joey Hess [Tue, 28 Jan 2025 19:46:00 +0000 (15:46 -0400)]
more OsPath conversion

Sponsored-by: mycroft
14 months agoMerge /home/joey/tmp/git-annex into ospath
Joey Hess [Tue, 28 Jan 2025 19:29:58 +0000 (15:29 -0400)]
Merge /home/joey/tmp/git-annex into ospath

14 months agoremove Read instance for AssociatedFile
Joey Hess [Tue, 28 Jan 2025 19:29:25 +0000 (15:29 -0400)]
remove Read instance for AssociatedFile

This instance is not used.

14 months agocorrect typo
cwg [Tue, 28 Jan 2025 19:29:21 +0000 (19:29 +0000)]
correct typo

14 months ago(no commit message)
cwg [Tue, 28 Jan 2025 19:18:02 +0000 (19:18 +0000)]

14 months ago(no commit message)
andrew [Tue, 28 Jan 2025 18:07:59 +0000 (18:07 +0000)]

14 months agopoll vote (My phone (or MP3 player))
65.254.22.34 [Tue, 28 Jan 2025 17:09:37 +0000 (17:09 +0000)]
poll vote (My phone (or MP3 player))

14 months agopoll vote (My phone (or MP3 player))
65.254.22.34 [Tue, 28 Jan 2025 17:09:30 +0000 (17:09 +0000)]
poll vote (My phone (or MP3 player))

14 months agocomment
Joey Hess [Tue, 28 Jan 2025 15:57:03 +0000 (11:57 -0400)]
comment

14 months agoupdate
Joey Hess [Tue, 28 Jan 2025 15:38:04 +0000 (11:38 -0400)]
update

14 months agoupdate
Joey Hess [Tue, 28 Jan 2025 15:36:02 +0000 (11:36 -0400)]
update

14 months agocomment
Joey Hess [Tue, 28 Jan 2025 15:12:02 +0000 (11:12 -0400)]
comment

14 months agocomment
Joey Hess [Tue, 28 Jan 2025 14:28:35 +0000 (10:28 -0400)]
comment

14 months agoAdded a comment: Simple config amendment for Apache served repositories
beryllium@5bc3c32eb8156390f96e363e4ba38976567425ec [Tue, 28 Jan 2025 08:34:40 +0000 (08:34 +0000)]
Added a comment: Simple config amendment for Apache served repositories

14 months agomore OsPath conversion
Joey Hess [Mon, 27 Jan 2025 20:55:07 +0000 (16:55 -0400)]
more OsPath conversion

keyFile has a nice improvement; since a Key is a ShortByteString, it can
be converted to an OsPath without needing the copy that was done before.

Unfortunately, fileKey has to convert from a ShortByteString to a
ByteString in order to use attoparsec, and then the results get
converted back to an OsPath, so there are now 2 copies.
Maybe attoparsec will eventually get a ShortByteString API,
see https://github.com/haskell/attoparsec/issues/225

Sponsored-by: Joshua Antonishen
14 months agooptimise literalOsPath
Joey Hess [Mon, 27 Jan 2025 19:54:24 +0000 (15:54 -0400)]
optimise literalOsPath

Taking a ShortByteString and using OverloadedStrings should avoid it
being converted from a String.

The reason there is no IsString instance for OsPath is presumably the
bad behavior of IsString for ByteString on unicode btw. But
literalOsPath won't be used with unicode in git-annex.

Sponsored-by: unqueued
14 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 27 Jan 2025 16:23:13 +0000 (12:23 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

14 months agocomment
Joey Hess [Mon, 27 Jan 2025 16:19:16 +0000 (12:19 -0400)]
comment

14 months agoAdded a comment
matrss [Mon, 27 Jan 2025 15:26:15 +0000 (15:26 +0000)]
Added a comment